bitkeeper revision 1.1615.1.2 (429c8826fS2FuIKb-STmuvL0Hl6awQ)

ioemu fixes: do not install into /usr/share/qemu as it conflicts with
real qemu installations. Also, do not link x86/64 with a special linker
script -- breaks on SLES9 and ought to be unnecessary.
The linker scripts and configuration/Makefile environment all need
stripping out at some point.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/ioemu/configure b/tools/ioemu/configure
index f766fbcc3afcbcf83578d47c42dab0b38876b3c6..f49a38ca9faed46d8e47863cfa493a5bcef6a7b0 100755 (executable)
--- a/tools/ioemu/configure
+++ b/tools/ioemu/configure
@@ -338,7 +338,7 @@ if test -z "$prefix" ; then
     prefix="usr/local"
 fi
 mandir="$installroot/$prefix/share/man"
-datadir="$installroot/$prefix/share/qemu"
+datadir="$installroot/$prefix/share/xen/qemu"
 docdir="$installroot/$prefix/share/doc/qemu"
 bindir="$installroot/$prefix/bin"
 configdir="$installroot/etc/xen"

diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile
index 55a30f5dcf89c50b16f04554496a502027c5ba4d..bfe8befc25c2641c7336dfdc28d1edf5af4ba987 100644 (file)
--- a/tools/ioemu/target-i386-dm/Makefile
+++ b/tools/ioemu/target-i386-dm/Makefile
@@ -304,7 +304,9 @@ VL_LDFLAGS=
 ifdef CONFIG_STATIC
 VL_LDFLAGS+=-static
 endif
+ifeq ($(XEN_TARGET_ARCH),x86_32)
 VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(XEN_TARGET_ARCH).ld
+endif
 ifndef CONFIG_DARWIN
 ifndef CONFIG_WIN32
 VL_LIBS=-lutil